Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport of Updated docs added explanation. into release/1.16.x #17791

Merged
merged 10 commits into from
Jun 21, 2023
Merged

Backport of Updated docs added explanation. into release/1.16.x #17791

merged 10 commits into from
Jun 21, 2023
+4 −0

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #17751 to be assessed for backporting due to the inclusion of the label backport/1.16.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@absolutelightning
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "13903531eacb25fca9a599a0cdd4f70d47e5f006", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.

Description

Updated docs added explanation for #17582 (comment)

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/asheshvidyut/NET-3865/ideally-stunning-alien branch from 23f7e86 to fe7f0ce Compare June 16, 2023 15:49
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/asheshvidyut/NET-3865/ideally-stunning-alien branch 3 times, most recently from fe7f0ce to b8cc7ce Compare June 16, 2023 15:49
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/asheshvidyut/NET-3865/ideally-stunning-alien branch 4 times, most recently from 6ba2ceb to e9b8c93 Compare June 16, 2023 15:49
@github-actions github-actions bot added theme/api Relating to the HTTP API interface theme/cli Flags and documentation for the CLI interface type/docs Documentation needs to be created/updated/clarified labels Jun 16, 2023
github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes Jun 16, 2023
View reviewed changes
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@absolutelightning @analogue
Updated docs added explanation. (#17751)
fa1bb6f 
* init

* fix tests

* added -detailed in docs

* added change log

* fix doc

* checking for entry in map

* fix tests

* removed detailed flag

* removed detailed flag

* revert unwanted changes

* removed unwanted changes

* updated change log

* pr review comment changes

* pr comment changes single API instead of two

* fix change log

* fix tests

* fix tests

* fix test operator raft endpoint test

* Update .changelog/17582.txt

Co-authored-by: Semir Patel <semir.patel@hashicorp.com>

* nits

* updated docs

* explanation added

---------

Co-authored-by: Semir Patel <semir.patel@hashicorp.com>
absolutelightning and others added 5 commits June 21, 2023 11:36
@absolutelightning absolutelightning marked this pull request as ready for review June 21, 2023 06:11
@absolutelightning absolutelightning requested a review from a team as a code owner June 21, 2023 06:11
@absolutelightning absolutelightning merged commit b229229 into release/1.16.x Jun 21, 2023
@absolutelightning absolutelightning deleted the backport/asheshvidyut/NET-3865/ideally-stunning-alien branch June 21, 2023 06:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@absolutelightning absolutelightning absolutelightning approved these changes

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

Assignees

@absolutelightning absolutelightning

Labels
theme/api Relating to the HTTP API interface theme/cli Flags and documentation for the CLI interface type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hc-github-team-consul-core @github-team-consul-core-pr-approver @absolutelightning